Use system libgit2

diff --git a/debian/TODO b/debian/TODO
index 164f742efeca9c7769d8afab120a8ed98c919aa5..3638807a2874e2a8ee21336fafd3e3e39f013d8d 100644 (file)
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,6 +1,3 @@
 For 0.17.0 in unstable
 - update d/copyright
 - try to run the tests
-- remove embedded libgit2-sys
-  LIBGIT2_SYS_USE_PKG_CONFIG
-  https://github.com/alexcrichton/git2-rs/commit/ed629d783f629838611f07c5940a2608b7f97959

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 4034a8d09631948ce22ee661a553ee782f1d745a..2158303b91d4f30e4d05a400b9f8e395732e5cd5 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -6,6 +6,7 @@ upstream-branch = upstream
 
 [buildpackage]
 submodules = True
+ignore-branch = True
 
 [import-orig]
 upstream-vcs-tag = %(version)s

diff --git a/debian/patches/series b/debian/patches/series
index 03b84cb453eae0a51f23e5bbf5d7891e7ea22a08..83ab4c13ae8d0d1295a3bdff903a6693beaf894d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 clean-cargo-deps.patch
 local-jquery.patch
+use-system-libgit2.patch

diff --git a/debian/patches/use-system-libgit2.patch b/debian/patches/use-system-libgit2.patch
new file mode 100644 (file)
index 0000000..35f6d00
--- /dev/null
+++ b/debian/patches/use-system-libgit2.patch
@@ -0,0 +1,26 @@
+Description: Always use system libgit2
+Author: Ximin Luo <infinity0@debian.org>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/vendor/libgit2-sys-0.6.6/build.rs
++++ b/vendor/libgit2-sys-0.6.6/build.rs
+@@ -31,10 +31,8 @@
+     }
+     let has_pkgconfig = Command::new("pkg-config").output().is_ok();
+ 
+-    if env::var("LIBGIT2_SYS_USE_PKG_CONFIG").is_ok() {
+-        if pkg_config::find_library("libgit2").is_ok() {
+-            return
+-        }
++    if pkg_config::find_library("libgit2").is_ok() {
++        return
+     }
+ 
+     if !Path::new("libgit2/.git").exists() {
+--- a/vendor/libgit2-sys-0.6.6/.cargo-checksum.json
++++ b/vendor/libgit2-sys-0.6.6/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","Cargo.toml":"1716bfaf32d1c020e8f4a9220f28d8158feac531408dfc1f66eefae21f3744f4","build.rs":"32f1614473508047c68a95977074c32a41fafb7f08b26f9d5dd937576ecc594f","lib.rs":"427ae51eeab835af5bd1fc26f9b2eaad1f9fd58671ec080eb9def921dcfe2420"},"package":"c7a4e33e9f8b8883c1a5898e72cdc63c00c4f2265283651533b00373094e901c"}
+\ No newline at end of file
++{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","Cargo.toml":"1716bfaf32d1c020e8f4a9220f28d8158feac531408dfc1f66eefae21f3744f4","build.rs":"7006deca0e11974227326174088500df8f7d1708839378edfd242a11ed7f18c9","lib.rs":"427ae51eeab835af5bd1fc26f9b2eaad1f9fd58671ec080eb9def921dcfe2420"},"package":"c7a4e33e9f8b8883c1a5898e72cdc63c00c4f2265283651533b00373094e901c"}